Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 4 Dec 2013 14:29:39 +0000 (14:29 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 4 Dec 2013 14:29:39 +0000 (14:29 +0000)
commit375c911acc373b4765c0b6e53203e37ae4eb3745
tree73b7ea750be54ce2fdf72e73e36d50658048e0c6
parent81dcaaa97a21cb397cd326fdcb8f9953ea23ceff
parent9f0c658baedcd0f3f71c35b54965e440ffef0e45
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging